From: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Mon, 22 Nov 2021 10:41:58 +0000 (+0800)
Subject: gskglcompiler.c: Relax check for GL 3.x+ legacy contexts
X-Git-Tag: archive/raspbian/4.6.5+ds-1+rpi1~1^2~61^2^2~127^2
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=a619e8af4ab5688133675deb60e8a0fb1df53869;p=gtk4.git

gskglcompiler.c: Relax check for GL 3.x+ legacy contexts

On Windows with nVidia drivers at least, when we create a legacy context
via wglCreateContext(), we may still get a (W)GL 4.x context.  Allow
such contexts to also use GLSL version 130 instead of 110, so that
things do continue to work.
---

diff --git a/gsk/gl/gskglcompiler.c b/gsk/gl/gskglcompiler.c
index c885df8f45..e341e54c71 100644
--- a/gsk/gl/gskglcompiler.c
+++ b/gsk/gl/gskglcompiler.c
@@ -136,7 +136,8 @@ gsk_gl_compiler_new (GskGLDriver *driver,
 
       gdk_gl_context_get_version (context, &maj, &min);
 
-      if (maj == 3)
+      /* On Windows, legacy contexts can give us a GL 4.x context */
+      if (maj >= 3)
         self->glsl_version = SHADER_VERSION_GL3_LEGACY;
       else
         self->glsl_version = SHADER_VERSION_GL2_LEGACY;